Revision: bazaar--devo--1.2--patch-10
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Wed Feb  2 06:09:20 GMT 2005
Standard-date: 2005-02-02 06:09:20 GMT
Modified-files: libarch/conflict-handling.c
    libarch/conflict-handling.h tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-13
    thelove@canonical.com/bazaar--devo--1.2--patch-10
Summary: Fixes for resolved
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-13
   Two related fixes for bug #6081: commit during conflicted state and baz status lying

